Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 3 Apr 2010 12:47:25 +0000 (12:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 3 Apr 2010 12:47:25 +0000 (12:47 +0000)

Trivial merge